container: Properly reorder no-window children

... that are setup with gtk_widget_set_parent_window().

Fixes scrollbars not being drawn in GtkScrolledWindow.

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 796220876f5a0bd19863ee1da03d2d1bf5ca621f..86501d70401d565c9649662a471c5df56e73345d 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -3564,9 +3564,9 @@ gtk_container_draw_forall (GtkWidget *widget,
     {
       info.child = widget;
       info.window_depth = G_MAXINT;
-      if (_gtk_widget_get_has_window (widget))
+      window = _gtk_widget_get_window (widget);
+      if (window != gtk_widget_get_window (GTK_WIDGET (data->container)))
         {
-          window = _gtk_widget_get_window (widget);
           siblings = gdk_window_peek_children (gdk_window_get_parent (window));
           info.window_depth = g_list_index (siblings, window);
         }